meson: make sure gdk/gdkenumtypes.h is generated for users of libgtk_dep
authorTim-Philipp Müller <tim@centricular.com>
Sat, 11 Feb 2017 20:15:25 +0000 (20:15 +0000)
committerEmmanuele Bassi <ebassi@gnome.org>
Wed, 3 May 2017 14:10:52 +0000 (15:10 +0100)
Add libgdk_dep as dependency to the libgtk_dep declare_dependency(), so
that the generated gdk includes are generated before anything is built
that tries to include gtk headers (such as various tests that don't depend
on gdk directly).

gtk/meson.build

index d18f406e5c42de2533a95fedcec5c6b3427c4e08..9864ca6662a428962ea9c1a0cfda99626e8b1352 100644 (file)
@@ -798,10 +798,10 @@ libgtk_dep = declare_dependency(
     gtktypebuiltins_c,
     gtktypebuiltins_h,
   ],
-  dependencies: gtk_deps,
-  link_with: [libgtk, libgdk, libgsk],
+  dependencies: gtk_deps + [libgdk_dep, libgsk_dep],
+  link_with: libgtk,
   link_args: ['-Bsymbolic'],
-  include_directories: [confinc, gtkinc, gdkinc]
+  include_directories: [confinc, gtkinc]
 )